avformat/img2enc: Fix integer truncation when frame_pts is enabled
authorZhao Zhili <zhilizhao@tencent.com>
Mon, 23 Sep 2024 16:16:13 +0000 (00:16 +0800)
committerSebastian Ramacher <sramacher@debian.org>
Fri, 21 Feb 2025 12:16:27 +0000 (13:16 +0100)
Fix #11194

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
(cherry picked from commit f56a54387b9cea884ca139e9cb993ff6989b8def)

Gbp-Pq: Name 0003-avformat-img2enc-Fix-integer-truncation-when-frame_p.patch

libavformat/img2enc.c

index 526a11e5ee0c91b3385ae7f960f55945dd7e1f22..41638d92b877a8cfbcdfa0007016eddeb1f02aa2 100644 (file)
@@ -160,13 +160,13 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
             return AVERROR(EINVAL);
         }
     } else if (img->frame_pts) {
-        if (av_get_frame_filename2(filename, sizeof(filename), s->url, pkt->pts, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
+        if (ff_get_frame_filename(filename, sizeof(filename), s->url, pkt->pts, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
             av_log(s, AV_LOG_ERROR, "Cannot write filename by pts of the frames.");
             return AVERROR(EINVAL);
         }
-    } else if (av_get_frame_filename2(filename, sizeof(filename), s->url,
-                                      img->img_number,
-                                      AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
+    } else if (ff_get_frame_filename(filename, sizeof(filename), s->url,
+                                     img->img_number,
+                                     AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) {
         if (img->img_number == img->start_img_number) {
             av_log(s, AV_LOG_WARNING, "The specified filename '%s' does not contain an image sequence pattern or a pattern is invalid.\n", s->url);
             av_log(s, AV_LOG_WARNING,